auto merge of #471 : alexcrichton/cargo/issue-449, r=brson

This is often useful for picking up things like headers files from `*-sys`
packages when they had to compile locally (or perhaps for pkg-config).

Closes #449

diff --cc src/cargo/ops/cargo_rustc/mod.rs
Simple merge

diff --cc tests/test_cargo_compile.rs
Simple merge